From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 28 Sep 2009 14:27:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10242
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c82b08b74e0d4dd32f0e7a5609674f0f248004a3;p=emacs.git

*** empty log message ***
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d92ba2ebf36..2a8eb8be8f4 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-09-28  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi (History): Add IMAP support.
@@ -9,12 +8,10 @@
 
 	* trampver.texi: Set default value of `emacsimap'.
 
-=======
 2009-09-22  Daiki Ueno  <ueno@unixuser.org>
 
 	* gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.
 
->>>>>>> 1.320
 2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dired-x.texi (Technical Details): Delete